bitkeeper revision 1.1421.1.1 (4289b3a0n7JmXiz6fiz0QAfqJ_M1Lg)

XendDomainInfo.py:
  Redirect debug output to log.
PrettyPrint.py:
  Add prettyprintstring.
XendDomainInfo.py:
  Remove debug print.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/python/xen/xend/PrettyPrint.py b/tools/python/xen/xend/PrettyPrint.py
index 9e91b1144817965537faca7fd2fa385eabfdd1df..5fcc6e6d08dcdf998171c37d1e0c8be11a201e68 100644 (file)
--- a/tools/python/xen/xend/PrettyPrint.py
+++ b/tools/python/xen/xend/PrettyPrint.py
@@ -285,6 +285,16 @@ def prettyprint(sxpr, out=sys.stdout, width=80):
         sxp.show(sxpr, out=out)
     print >> out
 
+def prettyprintstring(sxp):
+    class tmpstr:
+        def __init__(self):
+            self.str = ""
+        def write(self, str):
+            self.str = self.str + str
+    tmp = tmpstr()
+    prettyprint(sxp, out=tmp)
+    return tmp.str
+
 def main():
     pin = sxp.Parser()
     while 1:

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 1fdfd4ca5ac1bb46b73ca8dfdd4c1efcf13b3d9a..334a154460d71bf1e6e94a056e301507f9ea08ec 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -28,7 +28,7 @@ from XendLogging import log
 from XendError import VmError
 from XendRoot import get_component
 
-from PrettyPrint import prettyprint
+from PrettyPrint import prettyprintstring
 
 """Flag for a block device backend domain."""
 SIF_BLK_BE_DOMAIN = (1<<4)
@@ -192,9 +192,8 @@ def vm_recreate(savedinfo, info):
     @param info:      domain info from xc
     @type  info:      xc domain dict
     """
-    print 'vm_recreate>'
-    print 'savedinfo=' ; prettyprint(savedinfo)
-    print 'info=', info
+    log.debug('savedinfo=' + prettyprintstring(savedinfo))
+    log.debug('info=' + str(info))
     vm = XendDomainInfo()
     vm.recreate = True
     vm.savedinfo = savedinfo